Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 22:50:00 +0000 (14:50 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 22:50:00 +0000 (14:50 -0800)

Trivial merge